Small changes to proposed stucture