Added Evan Schmitt's additions