updated to BS3