ENH:change the structure of solution