Slot based message deliverey model M1

Lets fix this too (even if not a new modification)