add vars,
change structure