30 more equations + name changes