improvements for handheld