Adam changes

Reviewed changes from Adam and created a pull request.

/Stefan