move more code around
6.1.0