Define ONE? and SPACE
Update PR to use SPACE