Refactored Roger Kadapter