Worked on signal handlers