Updated edit for new subtype