updated output structure