Merging Allan's changes for altitude commas