refactor - place alterations at the end