Latest changes for skills and location