Update to defining and defining variables