changes
Fixed & improved