lots more fixing