Update app to use #when instead of the call counter