improvements-from-richard
