integrated 1.97 as requested by Jesse