changing discs to disc[][] and more progress