fixing our changes