additions to support update to beta 2