Changes as requested by Glloyd.