Infrastructural changes to support "It is in your bed", etc.