More testing, plus some code editing to put together two lines