UI 18-8 final commit