Improoved perfomance and added time to log