Still broken but better