What have been changed in lines 68-82 and 82-96?