refactored Otanga