refactored
better logging