Just small modifications as requested.