Serveral changes