Ticket #3 changes