Revert "Revert "first commit -rs""

This reverts commit f31d43c6590c2c37172a3869fc56fe62fd70bbe4.