lol
Bug fixes.. no more duplicate event