More testing/tweaking.