some changes
some adjustments