Expanded with a few additional vars