Solved #10 and #12