Added output option and summary