before big branch

about to implement deletion in another branch