change var name.  update some signatures.