changed to correct setup