Changed location dependancy for utility functions