added some missing handler code