Fix insert and maybe the remove and add driver?