1. add time 2. cleanup