Edited utility functions