More effects and changed naming slightly