Orbwalker + small tweak