Added UAC
Minor changes AUC in progress