Fixes branch

finally i done it right