fixes. Essayons de faire plus pro plz
merge. lets be more professional plz