Dev

Updates for setup file