Changed the way dA parsing works