some changes with copy, updates