updated support for BS3