Change to use spaces only