update self = this to that = this to be in sync with core app