Had to modify two files because lines were too long for the compiler