more moving around of code