small changes, may need to resolve