Has the contents of this class actually changed (apart from being extracted in to own class - which is great, btw)?