Believe this is the final change for parser