Reworked some lines because it was erased by some merge.