Update fork [JB branch]