WIP attempt to improve space performance