I'll PR my changes, thanks