Lots of changes to try and get the village data