Updates to courtyard and descent 1