changes
some adjustments