small changes
resolvation?