Refactored problems 63 & 67