Added everyone's suggestions