Still broken, but in a different, better way!