solved #18 & #67
solved #9