"this" was added to some vars