Looking much better :) Let me try running it over CI now.