diff --git a/ciso.py b/ciso.py
index bced6c3..52ef4aa 100755
--- a/ciso.py
+++ b/ciso.py
@@ -6,6 +6,8 @@
 import os
 import struct
 import sys
+import shutil
+import math
 import lz4.frame
 
 CISO_MAGIC = 0x4F534943 # CISO
@@ -221,9 +223,423 @@ def compress_iso(infile):
 		pad_file_size(fout_2)
 		fout_2.close()
 
+
+def is_xbe_file(xbe, offset = 0):
+	if not os.path.isfile(xbe):
+		return False
+
+	with open(xbe, 'rb') as xbe_file:
+		xbe_file.seek(offset)
+		magic = xbe_file.read(4)
+
+		if magic != b'XBEH':
+			return False
+
+	return True
+
+def get_iso_root_dir_offset_and_size(iso_file):
+	global image_offset
+
+	iso_header_offset    = 0x10000
+	root_dir_sect_offset = 0x14
+	sector_size          = 0x800
+
+	with open(iso_file, 'rb') as f:
+		detect_iso_type(f)
+
+		f.seek(image_offset + iso_header_offset + root_dir_sect_offset)
+		root_dir_sect    = struct.unpack('<I', f.read(4))[0]
+		root_dir_offset  = image_offset + root_dir_sect * sector_size
+		root_dir_size    = struct.unpack('<I', f.read(4))[0]
+
+	return root_dir_offset, root_dir_size
+
+def get_file_offset_in_iso(iso_file, search_file):
+	global image_offset
+
+	file_offset, file_size = get_iso_root_dir_offset_and_size(iso_file)
+
+	for item in search_file.split('\\'):
+		file_offset, file_size = get_iso_entry_offset_and_size(iso_file, item, file_offset, file_size)
+
+		if file_offset == 0 or file_size == 0:
+			return 0
+
+		file_offset += image_offset
+
+	return file_offset
+
+def get_iso_entry_offset_and_size(iso_file, search_file, dir_offset, dir_size):
+	dir_ent_size = 0xe
+	sector_size  = 0x800
+	dword        = 4
+
+	search_file = search_file.casefold()
+
+	with open(iso_file, 'rb') as f:
+		# seek to dir
+		dir_sectors = math.ceil(dir_size / sector_size)
+		f.seek(dir_offset)
+
+		dir_bytes        = f.read(dir_sectors * sector_size)
+		dir_sector_bytes = [dir_bytes[i: i + sector_size] for i in range(0, len(dir_bytes), sector_size)]
+
+		# loop through dir entries
+		for sector_bytes in dir_sector_bytes:
+			cur_pos = 0
+
+			while True:
+				cur_pos_diff = sector_size - cur_pos
+
+				if cur_pos_diff <= 1:
+					break
+
+				dir_ent  = sector_bytes[cur_pos: cur_pos + dir_ent_size]
+				cur_pos += dir_ent_size
+				l_offset = struct.unpack('<H', dir_ent[0:2])[0]
+
+				if l_offset == 0xffff:
+					break
+
+				r_offset     = struct.unpack('<H', dir_ent[2:4])[0]
+				start_sector = struct.unpack('<I', dir_ent[4:8])[0]
+				file_size    = struct.unpack('<I', dir_ent[8:12])[0]
+				attribs      = struct.unpack('<B', dir_ent[12:13])[0]
+				filename_len = struct.unpack('<B', dir_ent[13:14])[0]
+				filename     = sector_bytes[cur_pos: cur_pos + filename_len].decode('utf-8')
+
+				#print("entry: %04X %04X %08X %02X" % (l_offset, r_offset, start_sector, attribs), file_size, filename_len, filename)
+
+				# entries are aligned on 4 byte bounderies
+				next_offset = (dword - ((dir_ent_size + filename_len) % dword)) % dword
+				cur_pos += filename_len + next_offset
+
+				# our entry was found, return the offset
+				if filename.casefold() == search_file:
+					ret_offset = start_sector * sector_size
+					return ret_offset, file_size
+
+	# entry wasn't found
+	return 0, 0
+
+# returns array with section header and raw bytes
+def get_xbe_section_bytes(xbe_file, search_section, xbe_offset = 0):
+	xbe_header_size     = 0x1000
+	section_header_size = 0x38
+	base_addr_offset    = 0x104
+	cert_addr_offset    = 0x118
+	num_sections_offset = 0x11c
+	sect_headers_offset = 0x120
+
+	ret_header_bytes = None
+	ret_raw_bytes    = None
+
+	with open(xbe_file, 'rb') as f:
+		f.seek(xbe_offset)
+		header_bytes = f.read(xbe_header_size * 10)
+
+		base_addr         = struct.unpack('<I', header_bytes[base_addr_offset: base_addr_offset + 4])[0]
+		cert_addr         = struct.unpack('<I', header_bytes[cert_addr_offset: cert_addr_offset + 4])[0]
+		num_sections      = struct.unpack('<I', header_bytes[num_sections_offset: num_sections_offset + 4])[0]
+		sect_headers_addr = struct.unpack('<I', header_bytes[sect_headers_offset: sect_headers_offset + 4])[0]
+
+		# section headers
+		for i in range(0, num_sections):
+			offset = sect_headers_addr - base_addr + i * section_header_size
+			sect_header_bytes = header_bytes[offset: offset + section_header_size]
+
+			flags     = sect_header_bytes[0:4]
+			rv_addr   = sect_header_bytes[4:8]
+			rv_size   = sect_header_bytes[8:12]
+			raw_addr  = sect_header_bytes[12:16]
+			raw_size  = sect_header_bytes[16:20]
+			name_addr = sect_header_bytes[20:24]
+
+			raw_addr  = struct.unpack('<I', raw_addr)[0]
+			raw_size  = struct.unpack('<I', raw_size)[0]
+			name_addr = struct.unpack('<I', name_addr)[0]
+
+			name_offset = name_addr - base_addr
+			name = readcstr(header_bytes, name_offset)
+
+			# title image section
+			if name == search_section:
+				ret_header_bytes = sect_header_bytes
+				f.seek(xbe_offset + raw_addr)
+				ret_raw_bytes = f.read(raw_size)
+				break
+
+	return ret_header_bytes, ret_raw_bytes
+
+# read C-style strings
+def readcstr(bytes, start):
+	end = bytes.find(b'\0', start)
+	sub = bytes[start: end]
+
+	return sub.decode()
+
+def format_title_bytes(title):
+	title_max_length = 40
+
+	title = title[0: title_max_length].strip()
+	title = title.ljust(title_max_length, "\x00")
+	title_bytes = title.encode('utf-16-le')
+
+	return title_bytes
+
+def check_title_overrides(iso_file, title_id, title):
+	default_xbe = 'default.xbe'
+
+	# Forza Motorsport + XBLA
+	if title_id == 0x584C8014 and title == 'CDX':
+		return gen_attach_xbe(iso_file, 'Forza.xbe')
+
+	# NCAA Football 2005 + Top Spin
+	if title_id == 0x584C000F and title == 'CDX':
+		return gen_attach_xbe(iso_file, 'NCAA\\DEFAULT.XBE', 'NCAA Football 2005 + Top Spin')
+
+	# Hitman 2: Silent Assassin (Rev 2)
+	if title_id == 0x45530009 and title == 'CDX':
+		return gen_attach_xbe(iso_file, 'hm2.xbe')
+
+	# Star Wars: The Clone Wars + Tetris Worlds
+	if title_id == 0x584C000D and title == 'CDX':
+		return gen_attach_xbe(iso_file, 'CW\\default.xbe', 'StarWars: The Clone Wars + Tetris Worlds')
+
+	# Jade Empire (Bonus Disc)
+	if title_id == 0x4D530085 and title == 'CDX':
+		return gen_attach_xbe(iso_file, default_xbe, 'Jade Empire (Bonus Disc)')
+
+	# LucasArts Xbox Experience Volume 01
+	if title_id == 0x4C410010 and title == 'CDX':
+		return gen_attach_xbe(iso_file, default_xbe, 'LucasArts Xbox Experience Vol 01')
+
+	# MechAssault 2: Lone Wolf (Bonus Disc)
+	if title_id == 0x4D530083 and title == 'CDX':
+		return gen_attach_xbe(iso_file, default_xbe, 'MechAssault 2: Lone Wolf (Bonus Disc)')
+
+	# Xbox Live Starter Kit Disc (Rev 1)
+	if title_id == 0x584C0007 and title == 'CDX':
+		return gen_attach_xbe(iso_file, default_xbe, 'Xbox Live Starter Kit Disc (Rev 1)')
+
+	# Xbox Live Starter Kit Disc (Rev 3)
+	if title_id == 0x584C8010 and title == 'CDX':
+		return gen_attach_xbe(iso_file, default_xbe, 'Xbox Live Starter Kit Disc (Rev 3)')
+
+	# Ninja Gaiden Video + Dead or Alive X-Treme Beach Volleyball Video + DOA 3 Bonus Materials
+	if title_id == 0x54438005 and title == 'Xbox Demos':
+		return gen_attach_xbe(iso_file, 'Doa3\\doa3b.xbe', 'Dead or Alive 3 Booster - DEMO')
+
+	# Outlaw Golf: 9 Holes of X-Mas
+	if title_id == 0x5655801B and title == 'Xbox Demos':
+		return gen_attach_xbe(iso_file, 'OGXmas\\OLGDemo.xbe', 'Outlaw Golf: 9 Holes of X-Mas - DEMO')
+
+	# Outlaw Golf - 9 More Holes of X-Mas
+	if title_id == 0x53530006 and title == 'OUTLAW GOLF':
+		return gen_attach_xbe(iso_file, default_xbe, 'Outlaw Golf: 9 More Holes of X-Mas')
+
+	# Outlaw Golf: Holiday Golf
+	if title_id == 0x53538005 and title == 'Xbox Demos':
+		return gen_attach_xbe(iso_file, 'OGXmas\\OLGDemo.xbe', 'Outlaw Golf: Holiday Golf - DEMO')
+
+	# Sega GT 2002 + Jet Set Radio Future
+	if title_id == 0x4D53003D and title == 'Xbox Demos':
+		return gen_attach_xbe(iso_file, 'SegaGT.xbe', 'Sega GT 2002 + Jet Set Radio Future')
+
+	# Xbox Live Beta Starter Kit Disc v1.0
+	if title_id == 0x584C0004 and title == 'Xbox Demos':
+		return gen_attach_xbe(iso_file, default_xbe, 'Xbox Live Beta Starter Kit Disc v1.0')
+
+	# Xbox Live Starter Kit Disc
+	if title_id == 0x584C0007 and title == 'Xbox Demos':
+		return gen_attach_xbe(iso_file, default_xbe, 'Xbox Live Starter Kit Disc')
+
+def gen_attach_xbe(iso_file, iso_xbe = 'default.xbe', alt_title = ''):
+	base_dir      = os.path.dirname(os.path.abspath(iso_file))
+	in_file_name  = os.path.dirname(os.path.abspath(__file__)) + '/attach_cso.xbe'
+	out_file_name = base_dir + '/default.xbe'
+
+	if not is_xbe_file(in_file_name):
+		return
+
+	xbe_offset = get_file_offset_in_iso(iso_file, iso_xbe)
+
+	if xbe_offset == 0:
+		return
+
+	# https://www.caustik.com/cxbx/download/xbe.htm
+	title_max_length      = 40
+	title_img_sect_name   = '$$XTIMAGE'
+	num_new_sections      = 1
+	xbe_header_size       = 0x1000
+	section_header_size   = 0x38
+	base_addr_offset      = 0x104
+	xbe_img_size_offset   = 0x10c
+	cert_addr_offset      = 0x118
+	num_sections_offset   = 0x11c
+	sect_headers_offset   = 0x120
+	sect_rv_addr_offset   = 0x4
+	sect_rv_size_offset   = 0x8
+	sect_raw_addr_offset  = 0xc
+	sect_raw_size_offset  = 0x10
+	sect_name_addr_offset = 0x14
+	sect_name_ref_offset  = 0x18
+	sect_head_ref_offset  = 0x1c
+	sect_tail_ref_offset  = 0x20
+	sect_digest_offset    = 0x24
+	cert_title_id_offset  = 0x8
+	cert_title_offset     = 0xc
+
+	title_img_sect_header_bytes = None
+	title_img_sect_raw_bytes    = None
+
+	# pull data from source xbe
+	with open(iso_file, 'rb') as f:
+		f.seek(xbe_offset)
+		header_bytes = f.read(xbe_header_size * 10)
+
+		base_addr = struct.unpack('<I', header_bytes[base_addr_offset: base_addr_offset + 4])[0]
+		cert_addr = struct.unpack('<I', header_bytes[cert_addr_offset: cert_addr_offset + 4])[0]
+
+		# title
+		offset = cert_addr - base_addr + cert_title_offset
+		title_bytes = header_bytes[offset: offset + title_max_length * 2]
+
+		# title id
+		offset = cert_addr - base_addr + cert_title_id_offset
+		title_id_bytes = header_bytes[offset: offset + 4]
+
+		sect_header_bytes, title_img_sect_raw_bytes = get_xbe_section_bytes(iso_file, title_img_sect_name, xbe_offset)
+
+		if sect_header_bytes != None:
+			title_img_sect_header_bytes = bytearray(sect_header_bytes)
+
+	if alt_title:
+		title_bytes = format_title_bytes(alt_title)
+	elif title_bytes[0] == 0: # we got a blank title, fallback to iso name
+		title = os.path.splitext(os.path.basename(iso_file))[0]
+		title_bytes = format_title_bytes(title)
+
+	title_decoded = title_bytes.decode('utf-16-le').replace('\0', '')
+	title_bytes   = title_bytes[0:title_max_length * 2]
+	title_id      = struct.unpack("<I", title_id_bytes)[0]
+
+	# this indirectly calls gen_attach_xbe()
+	if not alt_title:
+		override_title = check_title_overrides(iso_file, title_id, title_decoded)
+		if override_title:
+			return override_title
+
+	title_id_decoded = "%08X" % title_id
+	print("Generating default.xbe - Title ID:", title_id_decoded, '- Title:', title_decoded+"\n")
+
+	# patch output xbe
+	with open(in_file_name, 'rb') as f:
+		out_bytes = bytearray(f.read())
+
+	base_addr = struct.unpack('<I', out_bytes[base_addr_offset: base_addr_offset + 4])[0]
+	cert_addr = struct.unpack('<I', out_bytes[cert_addr_offset: cert_addr_offset + 4])[0]
+	xbe_size  = struct.unpack('<I', out_bytes[xbe_img_size_offset: xbe_img_size_offset + 4])[0] - base_addr
+
+	# title
+	title_offset = cert_addr - base_addr + cert_title_offset
+	out_bytes[title_offset: title_offset + title_max_length * 2] = title_bytes
+
+	# title id
+	title_id_offset = cert_addr - base_addr + cert_title_id_offset
+	out_bytes[title_id_offset: title_id_offset + 4] = title_id_bytes
+
+	# title image
+	# patch gore incoming
+	if title_img_sect_header_bytes != None and title_img_sect_raw_bytes != None:
+		num_sections      = struct.unpack('<I', out_bytes[num_sections_offset: num_sections_offset + 4])[0]
+		sect_headers_addr = struct.unpack('<I', out_bytes[sect_headers_offset: sect_headers_offset + 4])[0]
+
+		title_img_sect_name_len = len(title_img_sect_name)
+		title_img_size  = len(title_img_sect_raw_bytes)
+		old_sect_offset = sect_headers_addr - base_addr
+		old_section     = out_bytes[old_sect_offset: old_sect_offset + section_header_size * num_sections]
+		new_sect_addr   = xbe_header_size - section_header_size * num_sections - title_img_sect_name_len - num_new_sections - section_header_size
+		new_sect_len    = xbe_header_size - new_sect_addr
+
+		# patch title img section header
+		new_sect_digest_addr = new_sect_addr + section_header_size * num_sections + sect_digest_offset
+		new_sect_name_addr   = new_sect_addr + new_sect_len - title_img_sect_name_len - 1
+		title_img_sect_header_bytes[sect_rv_addr_offset: sect_rv_addr_offset + 4]     = struct.pack('<I', xbe_size + base_addr)
+		title_img_sect_header_bytes[sect_rv_size_offset: sect_rv_size_offset + 4]     = struct.pack('<I', title_img_size)
+		title_img_sect_header_bytes[sect_raw_addr_offset: sect_raw_addr_offset + 4]   = struct.pack('<I', xbe_size)
+		title_img_sect_header_bytes[sect_raw_size_offset: sect_raw_size_offset + 4]   = struct.pack('<I', title_img_size)
+		title_img_sect_header_bytes[sect_name_addr_offset: sect_name_addr_offset + 4] = struct.pack('<I', new_sect_name_addr + base_addr)
+		title_img_sect_header_bytes[sect_name_ref_offset: sect_name_ref_offset + 4]   = bytearray(4)
+		title_img_sect_header_bytes[sect_digest_offset: sect_digest_offset + 20]      = bytearray(20)
+		title_img_sect_header_bytes[sect_head_ref_offset: sect_head_ref_offset + 4]   = struct.pack('<I', new_sect_digest_addr + base_addr)
+		title_img_sect_header_bytes[sect_tail_ref_offset: sect_tail_ref_offset + 4]   = struct.pack('<I', new_sect_digest_addr + 2 + base_addr)
+
+		# placed at the end of the xbe header
+		out_bytes[new_sect_addr: new_sect_addr + new_sect_len] = (
+			old_section +
+			title_img_sect_header_bytes +
+			bytearray(title_img_sect_name.encode()) +
+			b'\0'
+		)
+
+		# patch new data in xbe header
+		out_bytes[num_sections_offset: num_sections_offset + 4] = struct.pack('<I', num_sections + num_new_sections)
+		out_bytes[sect_headers_offset: sect_headers_offset + 4] = struct.pack('<I', new_sect_addr + base_addr)
+		out_bytes[xbe_img_size_offset: xbe_img_size_offset + 4] = struct.pack('<I', xbe_size + title_img_size + base_addr)
+
+		out_bytes += title_img_sect_raw_bytes
+
+	with open(out_file_name, 'wb') as f:
+		f.write(out_bytes)
+
+	return title_decoded
+
+# move output files to sub-folder
+def move_output_files(iso_file, output_name = '', len_limit = 255):
+	base_dir      = os.path.dirname(os.path.abspath(iso_file))
+	iso_base_name = os.path.splitext(os.path.basename(iso_file))[0]
+	out_file_name = base_dir + '/default.xbe'
+
+	if not output_name:
+		output_name = os.path.splitext(os.path.basename(iso_file))[0]
+		output_name = output_name.strip()
+
+	keepcharacters   = (' ', '.', '_', '-')
+	safe_title       = "".join(c for c in output_name if c.isalnum() or c in keepcharacters).rstrip()
+	safe_title_trunc = safe_title[0:len_limit - 6]
+
+	cios1_file = iso_base_name + '.1.cso'
+	cios2_file = iso_base_name + '.2.cso'
+	out_dir    = base_dir + '/' + safe_title
+	ciso1      = base_dir + '/' + cios1_file
+	ciso2      = base_dir + '/' + cios2_file
+	new_file   = out_dir  + '/' + os.path.basename(out_file_name)
+	new_cios1  = out_dir  + '/' + safe_title_trunc + '.1.cso'
+	new_cios2  = out_dir  + '/' + safe_title_trunc + '.2.cso'
+
+	if not os.path.isdir(out_dir):
+		os.makedirs(out_dir)
+	if os.path.exists(out_file_name) and os.path.exists(new_file):
+		os.remove(new_file)
+	if os.path.exists(ciso1) and os.path.exists(new_cios1):
+		os.remove(new_cios1)
+	if os.path.exists(ciso2) and os.path.exists(new_cios2):
+		os.remove(new_cios2)
+	if os.path.exists(out_file_name) and not os.path.exists(new_file):
+		shutil.move(out_file_name, new_file)
+	if os.path.exists(ciso1) and not os.path.exists(new_cios1):
+		shutil.move(ciso1, new_cios1)
+	if os.path.exists(ciso2) and not os.path.exists(new_cios2):
+		shutil.move(ciso2, new_cios2)
+
 def main(argv):
 	infile = argv[1]
 	compress_iso(infile)
+	title = gen_attach_xbe(infile)
+
+	if title:
+		move_output_files(infile, title, 42)
 
 if __name__ == '__main__':
 	sys.exit(main(sys.argv))