Parser deals with spaces now