Merge in Will's space hack