Revert
Add logging