further changes which should make it launchable