Added space preserve functionality