Merge: adding space control back in