make use of improved parser