rethink where to put date