making various changes trying to fix hang