Polyaromatic amines have been routinely tested for cigarette smoke for several years. Typical methods employed require complex sample extraction and clean up procedures, long run times, and extensive instrument maintenance. We sought to develop an improved method for analysis of 1 & 2-aminonaphthalene and 3 & 4-aminobiphenyl with application to cigarette and cigar smoke testing. Simplified sample preparation steps employed in the 2016 CORESTA Aromatic Amines collaborative study for seven aromatic amines using a method from BAT – Souza Cruz were adopted for use with this method. Based on the referenced technique: steps for liquid-liquid extraction, neutralization, and drying and concentrating steps were eliminated. For rapid analysis of the target compounds, gc column choice and parameters were optimized to allow for a short run time while maintaining or improving selectivity and sensitivity over our previous internal method. The optimized method was demonstrated to be applicable to cigarette and cigar smoke. Results for a range of products along with validation results will be discussed. A comparison between existing methods and the new method will be provided, as well.