better naming, update output