actually doing what should have happened in the last commit