lots of temporary work to fix HCN/BIN issue