update and organize