added signal management