More updates...relocate some vars.