Major refactor. [FIX] 5th and 6th graphs show different results