more solved!