last commit in troubleshooting before switching to new ABC branch