Updates as requested by Devon.