Tweak code as requested.