Refactor variable name, add some interactions