FIX Put back the features in the submitted version.