Add ECOS, make alphabetical