compatability changes for project B main