wip. not much improvement...