Improved robustness, eliminated extra output