3.0 +

A few tweaks from Cindy.