Changes many things.... cant describe
after merge