Update to entities based on info from Brandon