Restructured some based on new sections