Move to when/then