v 1.3 ------ * Correction on the PIN location