More progress on resourceCalc