Updated after lastest optimum run