Insert into logic improved
Merge with local branch