re-arrange and correct