#7 - master - refactor for processing performance (test all data)