Successful test run with minor tweaks.