draft
merge
cut fixed