One final commit to rule them all