copy-paste issues were fixed