ticket: 1 Changed according to mistakes