BS changes to get the swift code to compile