Revamped signal handling