MOAR

More changes, this time with Flair!