Modifications for mode 2