Refactored method to use "that = this" workaround...