Added back in bb index changes, commented out unneeded ones