timer needs to be fixed