#16 some minor changes [not working]
#18 adds some minor changes