converted delegate methods to .on