added the two handler calls and methods by Bill