Separated out a few things.