Before the optimization added in