added timer
resolved merge conflicts