removed subtypes and crudely fixed conflictswith