updated with suggested changes