Kudago refactored