more rejigging and start of handlers