Adding return values, now that we've worked them out