added files from eyaremenko-mbp