updated to with suggested changes