draft support and fixed delete.