added in the b0 vs nonb0 stuff