fixing major changes on branch