Updated with pin info