break things out better