Yapahuwa revisited