rearrange models slightly