fix duplicate code (merge fail!?)
add an addendum