changed calls to now() to os:timestamp()