intermediate change
Removed listeners on timeout
Intermediate changes