add support for space

Add support for space (needed a lot)