Resolvers review comments - also ensure correct copyright.