Update to ver 2