Cleaned up time protocols