better but still broken