Update according to URS review and scope / functional block allocation
Bug fix