Incorporated some timing functionality