pr comments and some switcharooing