Added some commented out troublshooting code