No longer passing entities to check-and-return-results