Changes for SRP