Updated look for pre 4.0