Update from Beck's repository