Added preliminary PA mapping