Re-designing commissioning