My changes to lines 94-106