new update
Merge https://github.com/borg-egg/dinosaur