<Lakshmi/ashwin/pooja>Modified  setup functionalities