upgrade to when3