ticket:1 remake structur for ticket 1