yet more changes woo