updated to current variables.