support for moment added w/ more pretty code