EXO insert rework again