Adding option and improving output