Made some changes that will be removed