Updated with suggested changes