- updated for use in the GSP merged version
- removed some logging