improvements to handle shindig