Still Broken but no NANs now