Rearranged AYD option for consistency