Changes as requested by Vadim.