Using the new signals API
Uniformized stuff