Incorporated changes proposed by David Bazilay