Added vars and empty conditionals