Added variables and functions