FIXED: review changes addred to SRS