changed more vars