Added output option, where needed.