copy test21b
quick fixes, lots of trust me