some changes; bug on receipt2!!