opt-grab.py perfomance upgrade