Select update && OT WIP