more moving of code around