removed more copy calls