Added eps generation, commented out