Many changes, still broken