Renamed Timestamp to NOW and Removed unused Params