Merge with old solution