made some minor changes to signaling