adam's changes

merge plz