Simplified and got working again.