updated to correct vars