modifying to allow destroy
fixing conflicts