finished issues #9 and #11