ticket:3 make same changes as in previous ticket