pulled adam's changes