ticket:5 some additions to previous commit