fixed final yosh