Changed initialisation