merging with bart2 branch