Tranfer some changes I already made