Added better timing