Updated per Ash F's suggestions