#55 some additions