Changed variables and functions