Update for tickets:
592, 594, 597, 598, 599,600, #3