Change draft of features and formatting