working on issues #6, #11