Changed now('ms') to timestamp()