combined lines 36 and 37