Made adjustments based on comments