Added vars, cleaned up mistake