minor shuffling

Some RS-xx added