added suggestions by WI