added two more vars