putting time and locations back in