3.0 BASDA fix me