Added logs and wait times