Adapted includes to fit both spaces