added eleanor & conformed to wiki data