commit before magos refactor