improved on omni complete output