In the 1560s, King Philip II and his architect, Juan de Herrera planned to change it into a proper square for the Courts. The first part to be finished was the Casa de la Panaderia (bakery) in 1590. Gómez de Mora gave it the rectangular form. The ground is still cobbled. It finally opened in 1620 under the rule of King Philip III.