ahammett: minor update to pass through vars