i take it back...let's merge as is and do copy fix as a separate ticket.