some changes explore
merge ok