Fixed Conor's enconding
Fixed Katies