Moved  out of install code
Modified  code