added space handleing