updates
updates, still not finished re-arranging