Water service utility Amatola Water, Makana municipality and consulting engineering company Bosch Projects continue to work hard to solve the water shortages in Makhanda, formerly Grahamstown, in the Eastern Cape.