DBC2 bleh changes