Added suggestions by Amanda