Updating instead of re-inserting + code comments