- improved parser to handle up and down.