Now the broken parts aren't so broken