apply

applied changes based on feedback