Major fix for rhoS, seems to work