Added previous changes from last repo