stucture fixes