some modification

Please review and commit