changes for BS3