Reshuffled a few things