changed; files by adam