Changes on ticketing

Changes on ticketing