SRS - Reworked section 11.2 and 11.3