Refactored the slot imlementation code 

Change this to debug?