Changed paths to non-anchor paths, working and stable