fix the structure to make it fleasible