Changes as requested by Rob