Fixing up this beauty here :)