final working change for insert 2.0