Original

Fixes and updates