revert some changes part 2