Added suggestions by WI