trying to standardize before migrate stuff