continue fixing and addind modes