Changed addressing/variable naming