Made adjustments as requested by Jon