Took out the resolved functionality