Added better effects management