adpated to match UI
merge