implemented changes suggested by WI