Move some things to make changes clearer