fixed to shift if outside 24 hours + removing listeners