Hopeful final commit before demo fix major bnode bug