Updated copy logic