added aaron's final parser changes