Slight changes to setup.