attemp1
delete old
hmm is this correct?
merge