Include Greg's fix for zScale and prep for HR demo