Updated 922

Update of #922