better creation handling
better adding and deletion