added files from gathsybeta