Readding some changes that got overwritten