Reduce load time from 7.5s to 2.5s

(Pairing with @olly)