Updated variables. Some names have changed.