Performance enhancements. Removed onMoveEvent.