merge with develop pulled out is_var; put it back in