converting to new conventions