redoing s/r section

This!