o Reverted changes to 'enter' and 'exit' events as they ended up being unnecessary.