added logging ( commented out )