Moving a few bits around to work better with rcm