Now uses appropriate time stamps