Added edit & remove functions