commented out the optimization stuff