Adding the location, finally, for CMU