Refactored the slot imlementation code 

Could we pass 'e', this seems incorrect.