NOREF: Changing to the standard skeleton and massaging r10k a little more