adding back in a few old variables