Amended to remove conflicts.