Separated some of the features.