amend self create/all/class to Frank's suggestions