More SRP work