some changes
reduce bug fixed