Updated spaces (take II)