More backend changes
attempting to resolve conflicts