added more vars