ticket:38 few changes