Changed setup logic