CYP - I changed a some parts of code, and fixed another's