'when' statement updated.