update and organzie