implemented suggested changes