Throw in an "Optionally" somewhere