copy changes and error fixed