Some updates and some new breaking stuff