broken still... but better