RSPF-25-17

Second part of complete renovation