fix/optimize/more data