Changes as requested by MehdiK.