Updated with additional timer corrected