Now works on pre 3.0 devices