Updating to BS3 part 2