incorporate some suggestions