Merge old code base