et changes for while related issues