Intial changes to setup file.
Update setup script