[UAA] changes after investigations of how uaa should work with Manuel G.