[BREAKING] removing a method and changing where event is called