Changed the way everything works