Changed how things generate