Changes on tickets

Changes on tickets