Better While implementation. Disabled for now