changed some stuff
merged and fixed conflicts. now it's responsibly and follow us no more fork