Better handleing.