Refactored procedures for Pin-pin 1.2