Split to be more cleaner and add range controle for trade