updated output; likely wrong though