Removed alerts and added mixins