Minor changes
More Utilities!