changes to #30 and #29 to make it ready to commit