Updated Conduit code, slimmed down basic version