commented out and added some logging