Modified changes according to suggestions