Final version for merge