Revertet some changes from another branch