Initial versions
manual merge