Update to latest version

Updating the latest changes from Jordan's main branch