Finishing up, added time and stuff