removed extra copy calls
removed more copys