Seems this could be in a separate method from SRP.