improved? functionality for commissioning