Merge branch 'refactor_sacrifices'