troubleshooting code added