tweaks to 8 and 9