updated class for BS 3.0 support