fixed paths, squash commit