***bb commit forthcoming (edited by Shawn)***