ticket:4 some changes