Updated sighandler