Updated for mode 3