Updated to reflect changes to initialisation