serveral changes