A little re-working of features.