And now tested in game, with some fixes.