Update according to suggestions