Got rid of the on* methods.