Updates as requested by Tim.