Updated Utilities