add a couple other bits that I know how to do