updates from kakai branch