Minor restructure in solution