Synching final changes for skills re-format.