do working ui ver
merged do and bjang master copy