UAC and UAS mostly done