Updating code. Adding more utilities