revert some changes which should not be committed yet-continued