Updated the conversion to handle other cases, and added a place in Boston.