Removed Location, using mixins, working events