update to work with spaces