more fixing up