Feature adaptation of Brett C. Leonard