Updated to include all upper half plane baselines