Additional work on spaces.