Updated AA to version 2, many things added