update from markku