add more instance state handling code