Added more vars