modified couple classes