changing pin numbers
better parsing