Updated to work with new food system