updated to remove logger