ticket:5 some changes