Final updates. Working copy