added now parameter
major cleanup