2.5

- Code refactored to be more efficient (related to event callbacks)