Core

Merging