some BS changes