Comments from Moroni Butandu (@mectitan)