changed the structure for BCs