working changes stashed
anti-hang fix