improved how handling