make parsing even better