- issues #1-#5 solved