RealClientMode replaced for ClientID

config/config.go

@@ -77,7 +77,7 @@ type Config struct {
 	PatchServerFile        string   // File patch server override
 	DeleteOnSaveCorruption bool     // Attempts to save corrupted data will flag the save for deletion
 	ClientMode             string
-	RealClientMode         Mode
+	ClientID               Mode
 	QuestCacheExpiry       int    // Number of seconds to keep quest data cached
 	CommandPrefix          string // The prefix for commands
 	AutoCreateAccount      bool   // Automatically create accounts if they don't exist
@@ -350,16 +350,16 @@ func LoadConfig() (*Config, error) {
 
 	for i := range versionStrings {
 		if strings.ToUpper(c.ClientMode) == versionStrings[i] {
-			c.RealClientMode = Mode(i + 1)
+			c.ClientID = Mode(i + 1)
 			c.ClientMode = strings.ToUpper(c.ClientMode)
-			if c.RealClientMode <= G101 {
+			if c.ClientID <= G101 {
 				c.ClientMode += " (Debug only)"
 			}
 		}
 	}
-	if c.RealClientMode == 0 {
+	if c.ClientID == 0 {
 		c.ClientMode = versionStrings[len(versionStrings)-1]
-		c.RealClientMode = ZZ
+		c.ClientID = ZZ
 	}
 
 	if c.GameplayOptions.MinFeatureWeapons > c.GameplayOptions.MaxFeatureWeapons {

network/crypt_conn.go

@@ -51,7 +51,7 @@ func (cc *CryptConn) ReadPacket() ([]byte, error) {
 	var encryptedPacketBody []byte
 
 	// Don't know when support for this was added, works in Forward.4, doesn't work in Season 6.0
-	if _config.ErupeConfig.RealClientMode < _config.F1 {
+	if _config.ErupeConfig.ClientID < _config.F1 {
 		encryptedPacketBody = make([]byte, cph.DataSize)
 	} else {
 		encryptedPacketBody = make([]byte, uint32(cph.DataSize)+(uint32(cph.Pf0-0x03)*0x1000))

network/mhfpacket/msg_mhf_acquire_cafe_item.go

@@ -31,7 +31,7 @@ func (m *MsgMhfAcquireCafeItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cl
 	m.ItemType = bf.ReadUint16()
 	m.ItemID = bf.ReadUint16()
 	m.Quant = bf.ReadUint16()
-	if _config.ErupeConfig.RealClientMode >= _config.G1 {
+	if _config.ErupeConfig.ClientID >= _config.G1 {
 		m.PointCost = bf.ReadUint32()
 	} else {
 		m.PointCost = uint32(bf.ReadUint16())

network/mhfpacket/msg_mhf_apply_dist_item.go

@@ -27,10 +27,10 @@ func (m *MsgMhfApplyDistItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Clie
 	m.AckHandle = bf.ReadUint32()
 	m.DistributionType = bf.ReadUint8()
 	m.DistributionID = bf.ReadUint32()
-	if _config.ErupeConfig.RealClientMode >= _config.G8 {
+	if _config.ErupeConfig.ClientID >= _config.G8 {
 		m.Unk2 = bf.ReadUint32()
 	}
-	if _config.ErupeConfig.RealClientMode >= _config.G10 {
+	if _config.ErupeConfig.ClientID >= _config.G10 {
 		m.Unk3 = bf.ReadUint32()
 	}
 	return nil

network/mhfpacket/msg_mhf_enumerate_dist_item.go

@@ -28,7 +28,7 @@ func (m *MsgMhfEnumerateDistItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.
 	m.DistType = bf.ReadUint8()
 	m.Unk1 = bf.ReadUint8()
 	m.Unk2 = bf.ReadUint16() // Maximum? Hardcoded to 256
-	if _config.ErupeConfig.RealClientMode >= _config.Z1 {
+	if _config.ErupeConfig.ClientID >= _config.Z1 {
 		m.Unk3 = bf.ReadBytes(uint(bf.ReadUint8()))
 	}
 	return nil

network/mhfpacket/msg_mhf_enumerate_quest.go

@@ -30,7 +30,7 @@ func (m *MsgMhfEnumerateQuest) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cli
 	m.Unk0 = bf.ReadUint8()
 	m.World = bf.ReadUint8()
 	m.Counter = bf.ReadUint16()
-	if _config.ErupeConfig.RealClientMode <= _config.Z1 {
+	if _config.ErupeConfig.ClientID <= _config.Z1 {
 		m.Offset = uint16(bf.ReadUint8())
 	} else {
 		m.Offset = bf.ReadUint16()

network/mhfpacket/msg_mhf_enumerate_shop.go

@@ -32,7 +32,7 @@ func (m *MsgMhfEnumerateShop) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Clie
 	m.ShopID = bf.ReadUint32()
 	m.Limit = bf.ReadUint16()
 	m.Unk3 = bf.ReadUint8()
-	if _config.ErupeConfig.RealClientMode >= _config.G2 {
+	if _config.ErupeConfig.ClientID >= _config.G2 {
 		m.Unk4 = bf.ReadUint8()
 		m.Unk5 = bf.ReadUint32()
 	}

network/mhfpacket/msg_mhf_savedata.go

@@ -30,7 +30,7 @@ func (m *MsgMhfSavedata) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientCon
 	m.AllocMemSize = bf.ReadUint32()
 	m.SaveType = bf.ReadUint8()
 	m.Unk1 = bf.ReadUint32()
-	if _config.ErupeConfig.RealClientMode >= _config.G1 {
+	if _config.ErupeConfig.ClientID >= _config.G1 {
 		m.DataSize = bf.ReadUint32()
 	}
 	if m.DataSize == 0 { // seems to be used when DataSize = 0 rather than on savetype?

network/mhfpacket/msg_mhf_stampcard_stamp.go

@@ -32,12 +32,12 @@ func (m *MsgMhfStampcardStamp) Opcode() network.PacketID {
 func (m *MsgMhfStampcardStamp) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
 	m.HR = bf.ReadUint16()
-	if _config.ErupeConfig.RealClientMode >= _config.G1 {
+	if _config.ErupeConfig.ClientID >= _config.G1 {
 		m.GR = bf.ReadUint16()
 	}
 	m.Stamps = bf.ReadUint16()
 	bf.ReadUint16() // Zeroed
-	if _config.ErupeConfig.RealClientMode >= _config.Z2 {
+	if _config.ErupeConfig.ClientID >= _config.Z2 {
 		m.Reward1 = uint16(bf.ReadUint32())
 		m.Reward2 = uint16(bf.ReadUint32())
 		m.Item1 = uint16(bf.ReadUint32())

network/mhfpacket/msg_mhf_update_myhouse_info.go

@@ -23,11 +23,11 @@ func (m *MsgMhfUpdateMyhouseInfo) Opcode() network.PacketID {
 // Parse parses the packet from binary
 func (m *MsgMhfUpdateMyhouseInfo) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
-	if _config.ErupeConfig.RealClientMode >= _config.G10 {
+	if _config.ErupeConfig.ClientID >= _config.G10 {
 		m.Data = bf.ReadBytes(362)
-	} else if _config.ErupeConfig.RealClientMode >= _config.GG {
+	} else if _config.ErupeConfig.ClientID >= _config.GG {
 		m.Data = bf.ReadBytes(338)
-	} else if _config.ErupeConfig.RealClientMode >= _config.F5 {
+	} else if _config.ErupeConfig.ClientID >= _config.F5 {
 		// G1 is a guess
 		m.Data = bf.ReadBytes(314)
 	} else {

network/mhfpacket/msg_sys_create_acquire_semaphore.go

@@ -25,7 +25,7 @@ func (m *MsgSysCreateAcquireSemaphore) Opcode() network.PacketID {
 func (m *MsgSysCreateAcquireSemaphore) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
 	m.Unk0 = bf.ReadUint16()
-	if _config.ErupeConfig.RealClientMode >= _config.S7 { // Assuming this was added with Ravi?
+	if _config.ErupeConfig.ClientID >= _config.S7 { // Assuming this was added with Ravi?
 		m.PlayerCount = bf.ReadUint8()
 	}
 	bf.ReadUint8() // SemaphoreID length

network/mhfpacket/msg_sys_create_semaphore.go

@@ -26,7 +26,7 @@ func (m *MsgSysCreateSemaphore) Opcode() network.PacketID {
 func (m *MsgSysCreateSemaphore) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
 	m.Unk0 = bf.ReadUint16()
-	if _config.ErupeConfig.RealClientMode >= _config.S7 { // Assuming this was added with Ravi?
+	if _config.ErupeConfig.ClientID >= _config.S7 { // Assuming this was added with Ravi?
 		m.PlayerCount = bf.ReadUint8()
 	}
 	bf.ReadUint8() // SemaphoreID length

network/mhfpacket/msg_sys_terminal_log.go

@@ -49,7 +49,7 @@ func (m *MsgSysTerminalLog) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Client
 		e.Unk1 = bf.ReadInt32()
 		e.Unk2 = bf.ReadInt32()
 		e.Unk3 = bf.ReadInt32()
-		if _config.ErupeConfig.RealClientMode >= _config.G1 {
+		if _config.ErupeConfig.ClientID >= _config.G1 {
 			for j := 0; j < 4; j++ {
 				e.Unk4 = append(e.Unk4, bf.ReadInt32())
 			}

server/channelserver/handlers.go

@@ -306,7 +306,7 @@ func handleMsgSysIssueLogkey(s *Session, p mhfpacket.MHFPacket) {
 
 func handleMsgSysRecordLog(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgSysRecordLog)
-	if _config.ErupeConfig.RealClientMode == _config.ZZ {
+	if _config.ErupeConfig.ClientID == _config.ZZ {
 		bf := byteframe.NewByteFrameFromBytes(pkt.Data)
 		bf.Seek(32, 0)
 		var val uint8
@@ -428,7 +428,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
 				resp.WriteUint16(uint16(len(c.userBinaryParts[userBinaryPartID{charID: session.charID, index: 3}])))
 
 				// TODO: This case might be <=G2
-				if _config.ErupeConfig.RealClientMode <= _config.G1 {
+				if _config.ErupeConfig.ClientID <= _config.G1 {
 					resp.WriteBytes(make([]byte, 8))
 				} else {
 					resp.WriteBytes(make([]byte, 40))
@@ -459,7 +459,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
 			case 0:
 				values := bf.ReadUint8()
 				for i := uint8(0); i < values; i++ {
-					if _config.ErupeConfig.RealClientMode >= _config.Z1 {
+					if _config.ErupeConfig.ClientID >= _config.Z1 {
 						findPartyParams.RankRestriction = bf.ReadInt16()
 					} else {
 						findPartyParams.RankRestriction = int16(bf.ReadInt8())
@@ -468,7 +468,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
 			case 1:
 				values := bf.ReadUint8()
 				for i := uint8(0); i < values; i++ {
-					if _config.ErupeConfig.RealClientMode >= _config.Z1 {
+					if _config.ErupeConfig.ClientID >= _config.Z1 {
 						findPartyParams.Targets = append(findPartyParams.Targets, bf.ReadInt16())
 					} else {
 						findPartyParams.Targets = append(findPartyParams.Targets, int16(bf.ReadInt8()))
@@ -478,7 +478,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
 				values := bf.ReadUint8()
 				for i := uint8(0); i < values; i++ {
 					var value int16
-					if _config.ErupeConfig.RealClientMode >= _config.Z1 {
+					if _config.ErupeConfig.ClientID >= _config.Z1 {
 						value = bf.ReadInt16()
 					} else {
 						value = int16(bf.ReadInt8())
@@ -499,7 +499,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
 			case 3: // Unknown
 				values := bf.ReadUint8()
 				for i := uint8(0); i < values; i++ {
-					if _config.ErupeConfig.RealClientMode >= _config.Z1 {
+					if _config.ErupeConfig.ClientID >= _config.Z1 {
 						findPartyParams.Unk0 = append(findPartyParams.Unk0, bf.ReadInt16())
 					} else {
 						findPartyParams.Unk0 = append(findPartyParams.Unk0, int16(bf.ReadInt8()))
@@ -508,7 +508,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
 			case 4: // Looking for n or already have n
 				values := bf.ReadUint8()
 				for i := uint8(0); i < values; i++ {
-					if _config.ErupeConfig.RealClientMode >= _config.Z1 {
+					if _config.ErupeConfig.ClientID >= _config.Z1 {
 						findPartyParams.Unk1 = append(findPartyParams.Unk1, bf.ReadInt16())
 					} else {
 						findPartyParams.Unk1 = append(findPartyParams.Unk1, int16(bf.ReadInt8()))
@@ -517,7 +517,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
 			case 5:
 				values := bf.ReadUint8()
 				for i := uint8(0); i < values; i++ {
-					if _config.ErupeConfig.RealClientMode >= _config.Z1 {
+					if _config.ErupeConfig.ClientID >= _config.Z1 {
 						findPartyParams.QuestID = append(findPartyParams.QuestID, bf.ReadInt16())
 					} else {
 						findPartyParams.QuestID = append(findPartyParams.QuestID, int16(bf.ReadInt8()))
@@ -535,15 +535,15 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
 					sb3.Seek(4, 0)
 
 					stageDataParams := 7
-					if _config.ErupeConfig.RealClientMode <= _config.G10 {
+					if _config.ErupeConfig.ClientID <= _config.G10 {
 						stageDataParams = 4
-					} else if _config.ErupeConfig.RealClientMode <= _config.Z1 {
+					} else if _config.ErupeConfig.ClientID <= _config.Z1 {
 						stageDataParams = 6
 					}
 
 					var stageData []int16
 					for i := 0; i < stageDataParams; i++ {
-						if _config.ErupeConfig.RealClientMode >= _config.Z1 {
+						if _config.ErupeConfig.ClientID >= _config.Z1 {
 							stageData = append(stageData, sb3.ReadInt16())
 						} else {
 							stageData = append(stageData, int16(sb3.ReadInt8()))
@@ -592,7 +592,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
 					resp.WriteUint8(uint8(len(stage.rawBinaryData[stageBinaryKey{1, 1}])))
 
 					for i := range stageData {
-						if _config.ErupeConfig.RealClientMode >= _config.Z1 {
+						if _config.ErupeConfig.ClientID >= _config.Z1 {
 							resp.WriteInt16(stageData[i])
 						} else {
 							resp.WriteInt8(int8(stageData[i]))
@@ -1065,7 +1065,7 @@ func handleMsgMhfStampcardStamp(s *Session, p mhfpacket.MHFPacket) {
 		{300, 5392, 1, 5392, 3},
 		{999, 5392, 1, 5392, 4},
 	}
-	if _config.ErupeConfig.RealClientMode <= _config.Z1 {
+	if _config.ErupeConfig.ClientID <= _config.Z1 {
 		for _, reward := range rewards {
 			if pkt.HR >= reward.HR {
 				pkt.Item1 = reward.Item1
@@ -1078,7 +1078,7 @@ func handleMsgMhfStampcardStamp(s *Session, p mhfpacket.MHFPacket) {
 
 	bf := byteframe.NewByteFrame()
 	bf.WriteUint16(pkt.HR)
-	if _config.ErupeConfig.RealClientMode >= _config.G1 {
+	if _config.ErupeConfig.ClientID >= _config.G1 {
 		bf.WriteUint16(pkt.GR)
 	}
 	var stamps, rewardTier, rewardUnk uint16
@@ -1123,7 +1123,7 @@ func handleMsgMhfGetEarthStatus(s *Session, p mhfpacket.MHFPacket) {
 	bf.WriteInt32(s.server.erupeConfig.EarthStatus)
 	bf.WriteInt32(s.server.erupeConfig.EarthID)
 	for i, m := range s.server.erupeConfig.EarthMonsters {
-		if _config.ErupeConfig.RealClientMode <= _config.G9 {
+		if _config.ErupeConfig.ClientID <= _config.G9 {
 			if i == 3 {
 				break
 			}
@@ -1345,10 +1345,10 @@ func handleMsgMhfSetDailyMissionPersonal(s *Session, p mhfpacket.MHFPacket) {}
 
 func equipSkinHistSize() int {
 	size := 3200
-	if _config.ErupeConfig.RealClientMode <= _config.Z2 {
+	if _config.ErupeConfig.ClientID <= _config.Z2 {
 		size = 2560
 	}
-	if _config.ErupeConfig.RealClientMode <= _config.Z1 {
+	if _config.ErupeConfig.ClientID <= _config.Z1 {
 		size = 1280
 	}
 	return size

server/channelserver/handlers_cafe.go

@@ -97,7 +97,7 @@ func handleMsgMhfGetCafeDuration(s *Session, p mhfpacket.MHFPacket) {
 		cafeTime = uint32(gametime.TimeAdjusted().Unix()) - uint32(s.sessionStart) + cafeTime
 	}
 	bf.WriteUint32(cafeTime)
-	if _config.ErupeConfig.RealClientMode >= _config.ZZ {
+	if _config.ErupeConfig.ClientID >= _config.ZZ {
 		bf.WriteUint16(0)
 		ps.Uint16(bf, fmt.Sprintf(s.server.i18n.cafe.reset, int(cafeReset.Month()), cafeReset.Day()), true)
 	}

server/channelserver/handlers_campaign.go

@@ -68,7 +68,7 @@ func handleMsgMhfEnumerateCampaign(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteInt16(event.MaxHR)
 		bf.WriteInt16(event.MinSR)
 		bf.WriteInt16(event.MaxSR)
-		if _config.ErupeConfig.RealClientMode >= _config.G3 {
+		if _config.ErupeConfig.ClientID >= _config.G3 {
 			bf.WriteInt16(event.MinGR)
 			bf.WriteInt16(event.MaxGR)
 		}

server/channelserver/handlers_cast_binary.go

@@ -240,7 +240,7 @@ func parseChatCommand(s *Session, command string) {
 		}
 	case commands["KeyQuest"].Prefix:
 		if commands["KeyQuest"].Enabled || s.isOp() {
-			if s.server.erupeConfig.RealClientMode < _config.G10 {
+			if s.server.erupeConfig.ClientID < _config.G10 {
 				sendServerChatMessage(s, s.server.i18n.commands.kqf.version)
 			} else {
 				if len(args) > 1 {
@@ -336,7 +336,7 @@ func parseChatCommand(s *Session, command string) {
 					case "cm", "check", "checkmultiplier", "multiplier":
 						sendServerChatMessage(s, fmt.Sprintf(s.server.i18n.commands.ravi.multiplier, s.server.GetRaviMultiplier()))
 					case "sr", "sendres", "resurrection", "ss", "sendsed", "rs", "reqsed":
-						if s.server.erupeConfig.RealClientMode == _config.ZZ {
+						if s.server.erupeConfig.ClientID == _config.ZZ {
 							switch args[1] {
 							case "sr", "sendres", "resurrection":
 								if s.server.raviente.state[28] > 0 {

server/channelserver/handlers_character.go

@@ -58,7 +58,7 @@ type CharacterSaveData struct {
 
 func getPointers() map[SavePointer]int {
 	pointers := map[SavePointer]int{pGender: 81, lBookshelfData: 5576}
-	switch _config.ErupeConfig.RealClientMode {
+	switch _config.ErupeConfig.ClientID {
 	case _config.ZZ:
 		pointers[pWeaponID] = 128522
 		pointers[pWeaponType] = 128789
@@ -110,9 +110,9 @@ func getPointers() map[SavePointer]int {
 		pointers[pGardenData] = 26424
 		pointers[pRP] = 26614
 	}
-	if _config.ErupeConfig.RealClientMode == _config.G5 {
+	if _config.ErupeConfig.ClientID == _config.G5 {
 		pointers[lBookshelfData] = 5548
-	} else if _config.ErupeConfig.RealClientMode <= _config.GG {
+	} else if _config.ErupeConfig.ClientID <= _config.GG {
 		pointers[lBookshelfData] = 4520
 	}
 	return pointers
@@ -164,7 +164,7 @@ func (save *CharacterSaveData) Save(s *Session) {
 
 	save.updateSaveDataWithStruct()
 
-	if _config.ErupeConfig.RealClientMode >= _config.G1 {
+	if _config.ErupeConfig.ClientID >= _config.G1 {
 		err := save.Compress()
 		if err != nil {
 			s.logger.Error("Failed to compress savedata", zap.Error(err))
@@ -207,10 +207,10 @@ func (save *CharacterSaveData) Decompress() error {
 func (save *CharacterSaveData) updateSaveDataWithStruct() {
 	rpBytes := make([]byte, 2)
 	binary.LittleEndian.PutUint16(rpBytes, save.RP)
-	if _config.ErupeConfig.RealClientMode >= _config.F4 {
+	if _config.ErupeConfig.ClientID >= _config.F4 {
 		copy(save.decompSave[save.Pointers[pRP]:save.Pointers[pRP]+2], rpBytes)
 	}
-	if _config.ErupeConfig.RealClientMode >= _config.G10 {
+	if _config.ErupeConfig.ClientID >= _config.G10 {
 		copy(save.decompSave[save.Pointers[pKQF]:save.Pointers[pKQF]+8], save.KQF)
 	}
 }
@@ -224,7 +224,7 @@ func (save *CharacterSaveData) updateStructWithSaveData() {
 		save.Gender = false
 	}
 	if !save.IsNewCharacter {
-		if _config.ErupeConfig.RealClientMode >= _config.S6 {
+		if _config.ErupeConfig.ClientID >= _config.S6 {
 			save.RP = binary.LittleEndian.Uint16(save.decompSave[save.Pointers[pRP] : save.Pointers[pRP]+2])
 			save.HouseTier = save.decompSave[save.Pointers[pHouseTier] : save.Pointers[pHouseTier]+5]
 			save.HouseData = save.decompSave[save.Pointers[pHouseData] : save.Pointers[pHouseData]+195]
@@ -235,12 +235,12 @@ func (save *CharacterSaveData) updateStructWithSaveData() {
 			save.WeaponType = save.decompSave[save.Pointers[pWeaponType]]
 			save.WeaponID = binary.LittleEndian.Uint16(save.decompSave[save.Pointers[pWeaponID] : save.Pointers[pWeaponID]+2])
 			save.HR = binary.LittleEndian.Uint16(save.decompSave[save.Pointers[pHR] : save.Pointers[pHR]+2])
-			if _config.ErupeConfig.RealClientMode >= _config.G1 {
+			if _config.ErupeConfig.ClientID >= _config.G1 {
 				if save.HR == uint16(999) {
 					save.GR = grpToGR(int(binary.LittleEndian.Uint32(save.decompSave[save.Pointers[pGRP] : save.Pointers[pGRP]+4])))
 				}
 			}
-			if _config.ErupeConfig.RealClientMode >= _config.G10 {
+			if _config.ErupeConfig.ClientID >= _config.G10 {
 				save.KQF = save.decompSave[save.Pointers[pKQF] : save.Pointers[pKQF]+8]
 			}
 		}