Merged our the two utility files