Added missing grid variables + dist