Edited lines 14 and 32