Moved the parser around