Added checks for FLease times