new fire and cleaned up the box code for the big change.