updates : reorganize