Kiri4a kue refactor

winning submission for 30047518