finally making uniform