Reorganised initialisation