problems 15 & 67 commit