merged both our changes together