Change space
Add logging