some changes i made and forgot why
fix of last stupid changes
reach improvement