SC-25 Add further changes