added time and stuff