Modified to shave off .4 seconds