Move function to the right place
2 files changed