Removed Uglyness