New pin locations + random fix