BI methods
fixed merge conflict