should work now, sort of