Finished revert to s-representations.