Continue -> Next
simplified attach_three
general cleanup