updating with daniel's latest
...