Adjustments to allow re-initialisation