Changed resolve to be private