Another set of updates to the open / close behavior.