copy and fixes