Remember return values too