New version with insert