tweaked, but still broken