Added variables, etc, etc