Arrange for better space management