Baldur/auto advance

good merging point ... ;)