Added signal catching