Just improve banchmark and refactor it