Some changes
some resolving...