Refactored events..