Further testing and tweaking