adding comments and reorg