removed some code for troubleshooting