Added some timing stuff