Removed conditional if discrete for time