changes 2/3 from walter