changed space as delimiter to some places