We propose the use of a new method to efficiently compute the annual energy production (AEP) of a wind farm by properly handling the uncertainties in the wind direction and wind speed. We apply the new ideas to the layout optimization of a large wind farm. We show significant computational savings by reducing the number of simulations required to accurately compute and optimize the AEP of different wind farms.