Updated to include hilly ground