Added lines 38-102