Keep everything running smooth even in harsh conditions+

Keep everything running smooth even in harsh conditions