Fix step
Fix step implementation (should have been buggy before!)
Fix adding mr to set