Added more years & sampling for faster development