Update fork [KK branch]