Resctructure, still not optimal