switched to new while notation