a little more changes (smarter inserts?)