Update first step of the algo !!! YAHOU
Updates fixes and stuff
merge conflicts