RTM

Some changes for RTM use. We need to talk about this Pete