more testing/tweaking