moved couple functions, added del