Update based on feedback from Khuliso