added some important changes