solved & changed