Reshuffled a few things based on Stefanie's comments.