Changes made for the AAAI submission