Updated to latest version of Space