Made Dramatic Changes to setup