Copied over last changes

This is an attempt to fix the no pull request.