move some of the improvements from figures to this guy