removed state and added resolvers