some adjusts
some changes