add manual changes with Francois and Jarred; still ugly but more useful