Modified PinEditor