Change endSetActivity and endSetReturnActivity