Previous change caused regression
Added ability to limit output