Added signal checks (version 1)