updated resolvers