No more manual loading of z