updates to AbstractHandler
conflicts