Tweaked to match YABTFW file structure