changed the sturcture