Added permission to time check, cleaned up returns.