Reverted most of the shortening, it's now only golfed a little