Totally changed how it works