Modified Pin-mapping