Changed setup finally