ticket:3 make changes according to comments in ticket