Refactor to avoid conflicts?