Merging Adams Pull request