Reshuffling everything for more clarity