Updates to reflect the suggestions