Updated for FOX-1.6