Serveral changes made