major changes, switch back to bulk chi1