In 1668, the King appointed Rupert to be the Constable of Windsor Castle. Rupert was already one of the Knights of the Garter, who had their headquarters at the castle, and was a close companion of the King, who would wish to be suitably entertained at the castle. Rupert immediately began to reorder the castle's defences, sorting out the garrison's accommodation, repairing the Devil's Tower, reconstructing the real tennis court and improving the castle's hunting estate. Rupert acquired his own apartments in the castle, which were recorded as being "very singular" with some decorated with an "extraordinary" number of "pikes, muskets, pistols, bandoliers, holsters, drums, back, breast, and head pieces", and his inner chambers "hung with tapisserie, curious and effeminate pictures". King Charles II and Rupert spent much time together over the years hunting and playing tennis together at Windsor, and Rupert was also a close companion of James, the Duke of York. Rupert was considered by Pepys to be the fourth best tennis player in England.