more BS changes